Merge branch 'master' of git://git.denx.de/u-boot-video
authorTom Rini <[email protected]>
Thu, 9 Feb 2017 19:54:09 +0000 (14:54 -0500)
committerTom Rini <[email protected]>
Thu, 9 Feb 2017 19:54:09 +0000 (14:54 -0500)

Trivial merge